Post Git & Github date change
fix conflicts