Added 1 line prior to merge conflict