You did not fix this conflict, you checked it in instead. Please fix this.