comlete new feature
complete another feature
resolve conflict