Fixed merge bugs. Added loading indicators.