Removing line created by previous git conflict.