merged properly