Removed Git conflict lines
Removed Git conflict lines