first commit
fixed merger issue