Fix merge shit