fixed small issues with merge