Issue 4 updates, issue 9 raised about conflict error in this scenario