Adam Conley makes his return as Marlins continue vs. Phillies