Removed Merge Resolution Files