ccommit remote
remote file in master
merge fix