removed git aliases
Fixed merge conflict