removed redundant files due to merge conflict