creating a merge conflict

[ErArman13]

i am trying to create a merge conflict and then will try to solve it. this is the part of project 2 .
@SadiqOnGithub

[SadiqOnGithub]

Since this is your second commit, I will suggest some changes.

[SadiqOnGithub]

can you please remove those 3 dots and replace with an exclamation!

[SadiqOnGithub]

make sure to merge the previous pull request, I have approved it. If you face any problem then ping me.
#4

[ErArman13]

make sure to merge the previous pull request, I have approved it. If you face any problem then ping me. #4

Isnt it already merged?

[SadiqOnGithub]

make sure to merge the previous pull request, I have approved it. If you face any problem then ping me. #4

Isnt it already merged?

yes, it is already merged. but please see the changes I have requested.

[ErArman13]

Those 3 dots? Yes i will do it when I get off the bus... Also i have done project 2 with another partner as no one was online at that time to approve... Will start project 3
@SadiqOnGithub

[SadiqOnGithub]

Those 3 dots? Yes i will do it when I get off the bus... Also i have done project 2 with another partner as no one was online at that time to approve... Will start project 3 @SadiqOnGithub

good job!

[SadiqOnGithub]

Those 3 dots? Yes i will do it when I get off the bus... Also i have done project 2 with another partner as no one was online at that time to approve... Will start project 3 @SadiqOnGithub

I am resolving the merge conflict

[SadiqOnGithub]

review and approved