Fixed the merge issues