Fixed conflicts, rebuilt.