diff --git a/USERNAME.md b/USERNAME.md index f8051ae..e5d166c 100644 --- a/USERNAME.md +++ b/USERNAME.md @@ -1,3 +1,4 @@ +# This is a new combined line to resolve the conflict. and it created conflict while merging main into feature branch this will definetly create some conflict! let's try this with a end line