Fix atom config
update paths to p4merge