Removed conflict file