Removed random git merge lines + fixed daily