feature branch remote commit
conflict
fixing conflicts
committing 3 text