Deleted Unnecessary class from Merge error