Removed merge lines