pushing for the first time
resolving conflicts in readme file