Updated and resolved conflicts