Removed some trails of merge conflict