added file to feature-branch-remote
added commit remote file
fixed conflicts