Removed last line of MergeConflict - q1.4