commit remote
added new commit remote file
solved conflict