fixed merged issue