trying to git rid of conflicts