Removed merged conflicts