cleaned up the conflicts in branch merge