Fixed conflicts from manua file synchronization
Resolved conflicts between local and remote