Missed merge conflict fixed