fixed fail merge