remove wierd merge conflicts