l
mpl;
l
Merge branch 'rr'
,p
l
p
Merge branch 'qq'
x
z
s
Merge branch 'ww'

Conflicts:
	src/main/java/com/springapp/mvc/entities/Entity.java
k
k
k
Merge branch 'we'

Conflicts:
	src/main/java/com/springapp/mvc/entities/Entity.java
l
l
k
l