Small changes
Fix conlflicts