Added conflict line from github