Got merge part finished