Solve psl conflict