removed one conflict after merge - #4