Removed potential merge conflicts