app.css merge issue with app.sass

[Niko2040]

Im using sass in my project, and I use compass watch on my folder which contains my stylesheets. It worked fine for awhile, but now everytime I make changes and push my changes to my repo; I keep getting merge issues with my app.css. The error I get in my terminal is\[code\]git pushremote: Counting objects: 54, done.remote: Compressing objects: 100% (9/9), done.remote: Total 30 (delta 21), reused 30 (delta 21)Unpacking objects: 100% (30/30), done.From github.com: **********/********* a2f68c3..2537c71 master -> origin/masterAuto-merging public/stylesheets/app.cssCONFLICT (content): Merge conflict in public/stylesheets/app.cssAuto-merging public/sass/app.sassAutomatic merge failed; fix conflicts and then commit the result.\[/code\]I found a way to get passed it by deleting app.css, and then making a random change in the sass file. That makes it make a new app.css and everything works fine like that until the next push.