No conflict mode improved, updated grunt for versioning