a non conflicted file is better :p