pre-merge operation commit
Pre-merge conflict fix
removed redundancy