Fix merge not resolved

Fix #20