test 2
test 3 4
=feature test 5
test 6 feature 5
bug fixes develop
bug fix test 8-9
feature category
test conflict
=feature test 5
test 6 feature 5
test conflict
Merge branch 'feature/test5' into develop
test commit conflict dari feature category
feature category
test commit conflict dari feature category
Merge branch 'feature/category' into develop
conflict bro dari feature test5
resolve conflcit
resolve conlfict
adding change feature category