Fixed merge conflicts that were auto merged
incompatible changes