Resolve conflits #6