confictgit commit -a