Fixed the missed merge artifacts