Removed comflicted files