fixing conflit

CHANGELOG.md

+## [0.0.38-RELEASE] 
+### Added
+- New features that have been added.
+
+### Changed
+- Changes in existing functionality.
+
+### Deprecated
+- Soon-to-be removed features.
+
+### Removed
+- Features that have been removed.
+
+### Fixed
+- Any bug fixes.
+
+### Security
+- Any security improvements.
 ## [0.0.37-RELEASE] 
 ### Added
 - New entites for assistant devoir such as  motivationphrase  

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>com.marketingconfort</groupId>
 	<artifactId>brainboost-common</artifactId>
-	<version>0.0.37-RELEASE</version>
+	<version>0.0.38-SNAPSHOT</version>
 	<name>brainboost-common</name>
 	<description>Brain Boost common project </description>
 	<url/>