junit target added and paths modified
resolved conflicts