check merge
need to commit again?