Removed git conflict code in master