Merge confirmed
-.-