commit message
resolving git conflickt