First commit
resolving 1st conflict