Hopefully fixed the merge problem