Fixed conflicts, rebased