finally without merge conflicts