fixed merge conflict

git [02-10-18 - 19:26]
fixed merge conflict
Filename