Always runs now
Resolving merge conflicts