Got rid of merge conflicts