fixed line error, git merge is buggy