Cleaning up merge issue