Resolving some merge conflicts that arose