merged properly

+unfailed at merging