Unit Test added
conflicts fixed