finally fixed git merge issues!