Resolved conflicts and added README