Some local changes
Resolving some conflicts