Feature/junit

Fix #188 junit not merging doing to a conflict