Merge fail. Fixed the code