fixing broken render folowing merge