doing psl list
resolving merge conflict