Minor bugs changed
Resolved conffilcts.