Fixing merge

Here it is