fixes all the merge issues