I am commited
commit after conflict
change on amster
added new line
commiting once more o o or